(turn-on-font-lock): Use tty-display-color-p.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 6dac89577ba2806d472dff6c81a3db6ed0ce5423..f0257182eef35e3853a71974c7a31b35b795d253 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -714,7 +714,7 @@ buffer local value for `font-lock-defaults', via its mode hook."
 (defun turn-on-font-lock ()
   "Turn on Font Lock mode conditionally.
 Turn on only if the terminal can display it."
-  (when (and (not font-lock-mode) window-system)
+  (when (and (not font-lock-mode) (or window-system (tty-display-color-p)))
     (font-lock-mode)))
 
 ;;;###autoload